From 3b696774fcd41fd45fb51729865381fe31050d66 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Sat, 10 Oct 2009 17:35:28 +0200 Subject: [PATCH] Remove deprecated code: GdkPixbuf --- gdk-pixbuf/gdk-pixbuf-core.h | 7 ------- gdk-pixbuf/gdk-pixbuf.c | 33 --------------------------------- gdk-pixbuf/gdk-pixbuf.symbols | 4 ---- gdk-pixbuf/make-inline-pixbuf.c | 2 +- 4 files changed, 1 insertion(+), 45 deletions(-) diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h index b2563809ed..c6d5272cc5 100644 --- a/gdk-pixbuf/gdk-pixbuf-core.h +++ b/gdk-pixbuf/gdk-pixbuf-core.h @@ -84,13 +84,6 @@ GQuark gdk_pixbuf_error_quark (void); GType gdk_pixbuf_get_type (void) G_GNUC_CONST; -/* Reference counting */ - -#ifndef GDK_PIXBUF_DISABLE_DEPRECATED -GdkPixbuf *gdk_pixbuf_ref (GdkPixbuf *pixbuf); -void gdk_pixbuf_unref (GdkPixbuf *pixbuf); -#endif - /* GdkPixbuf accessors */ GdkColorspace gdk_pixbuf_get_colorspace (const GdkPixbuf *pixbuf); diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c index 349c98a1c6..71e0c61e9a 100644 --- a/gdk-pixbuf/gdk-pixbuf.c +++ b/gdk-pixbuf/gdk-pixbuf.c @@ -181,39 +181,6 @@ gdk_pixbuf_finalize (GObject *object) G_OBJECT_CLASS (gdk_pixbuf_parent_class)->finalize (object); } - - -/** - * gdk_pixbuf_ref: - * @pixbuf: A pixbuf. - * - * Adds a reference to a pixbuf. - * - * Return value: The same as the @pixbuf argument. - * - * Deprecated: 2.0: Use g_object_ref(). - **/ -GdkPixbuf * -gdk_pixbuf_ref (GdkPixbuf *pixbuf) -{ - return (GdkPixbuf *) g_object_ref (pixbuf); -} - -/** - * gdk_pixbuf_unref: - * @pixbuf: A pixbuf. - * - * Removes a reference from a pixbuf. - * - * Deprecated: 2.0: Use g_object_unref(). - **/ -void -gdk_pixbuf_unref (GdkPixbuf *pixbuf) -{ - g_object_unref (pixbuf); -} - - /* Used as the destroy notification function for gdk_pixbuf_new() */ static void diff --git a/gdk-pixbuf/gdk-pixbuf.symbols b/gdk-pixbuf/gdk-pixbuf.symbols index 2e2548df1e..93885956ea 100644 --- a/gdk-pixbuf/gdk-pixbuf.symbols +++ b/gdk-pixbuf/gdk-pixbuf.symbols @@ -15,10 +15,6 @@ #if IN_FILE(__GDK_PIXBUF_C__) gdk_pixbuf_error_quark gdk_pixbuf_get_type G_GNUC_CONST -#ifndef GDK_PIXBUF_DISABLE_DEPRECATED -gdk_pixbuf_ref -gdk_pixbuf_unref -#endif gdk_pixbuf_new gdk_pixbuf_get_bits_per_sample gdk_pixbuf_get_colorspace diff --git a/gdk-pixbuf/make-inline-pixbuf.c b/gdk-pixbuf/make-inline-pixbuf.c index f100820f7f..e2e1f6100d 100644 --- a/gdk-pixbuf/make-inline-pixbuf.c +++ b/gdk-pixbuf/make-inline-pixbuf.c @@ -219,7 +219,7 @@ main (int argc, char **argv) output_pixbuf (outfile, ext_symbols, argv[i], pixbuf); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); i += 2; } -- 2.30.2